Don't set MAKEFLAGS for build scripts

Closes #4156
Closes rust-lang/rust#42635

diff --git a/Cargo.lock b/Cargo.lock
index 3202cc68333996646406af60d9a8812bb1948336..306ede34e43712cc1afb79797f30c4720ac1803a 100644 (file)
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -20,7 +20,7 @@ dependencies = [
  "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "hamcrest 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "hex 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "jobserver 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "jobserver 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.25 (registry+https://github.com/rust-lang/crates.io-index)",
  "libgit2-sys 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -331,7 +331,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "jobserver"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "libc 0.2.25 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -906,7 +906,7 @@ dependencies = [
 "checksum hex 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d6a22814455d41612f41161581c2883c0c6a1c41852729b17d5ed88f01e153aa"
 "checksum idna 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2233d4940b1f19f0418c158509cd7396b8d70a5db5705ce410914dc8fa603b37"
 "checksum itoa 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "eb2f404fbc66fd9aac13e998248505e7ecb2ad8e44ab6388684c5fb11c6c251c"
-"checksum jobserver 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "4e28adc987f6d0521ef66ad60b055968107b164b3bb3cf3dc8474e0a380474a6"
+"checksum jobserver 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "443ae8bc0af6c106e6e8b77e04684faecc1a5ce94e058f4c2b0a037b0ea1b133"
 "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
 "checksum lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3b37545ab726dd833ec6420aaba8231c5b320814b9029ad585555d2a03e94fbf"
 "checksum libc 0.2.25 (registry+https://github.com/rust-lang/crates.io-index)" = "b807d3f9f61fec68ffa8b10389fffb9235aa0ffa32935be864b2329de5846b74"

diff --git a/Cargo.toml b/Cargo.toml
index ca033e571d84ea0ee606e088e0500930c71ca9ea..d7ea2ccfbc82ba9a594f3179b50f2348c3a86dbd 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -31,7 +31,7 @@ git2 = "0.6"
 git2-curl = "0.7"
 glob = "0.2"
 hex = "0.2"
-jobserver = "0.1.4"
+jobserver = "0.1.6"
 libc = "0.2"
 libgit2-sys = "0.6"
 log = "0.3"

diff --git a/tests/cargotest/lib.rs b/tests/cargotest/lib.rs
index dcb098a8e461ae7ac5eb18da2ebf90ba4333e524..99f5617ba3e676c869897c032676502390bea9b5 100644 (file)
--- a/tests/cargotest/lib.rs
+++ b/tests/cargotest/lib.rs
@@ -61,6 +61,7 @@ fn _process(t: &OsStr) -> cargo::util::ProcessBuilder {
      .env_remove("EMAIL")
      .env_remove("MFLAGS")
      .env_remove("MAKEFLAGS")
+     .env_remove("CARGO_MAKEFLAGS")
      .env_remove("GIT_AUTHOR_NAME")
      .env_remove("GIT_AUTHOR_EMAIL")
      .env_remove("GIT_COMMITTER_NAME")

diff --git a/tests/jobserver.rs b/tests/jobserver.rs
index 7d055de1726d326ea1eb02677c2b30f990fe2630..41db11e7b8d3d8232afba955e359f4a9c2af45f5 100644 (file)
--- a/tests/jobserver.rs
+++ b/tests/jobserver.rs
@@ -23,7 +23,7 @@ fn jobserver_exists() {
             use std::env;
 
             fn main() {
-                let var = env::var("MAKEFLAGS").unwrap();
+                let var = env::var("CARGO_MAKEFLAGS").unwrap();
                 let arg = var.split(' ')
                              .find(|p| p.starts_with("--jobserver"))
                              .unwrap();